From 973ade2db80600ac89d7ab68f5d8fe53069cb4f7 Mon Sep 17 00:00:00 2001
From: Stephane Glondu <steph@glondu.net>
Date: Tue, 30 Jun 2026 10:13:46 +0200
Subject: [PATCH] Update packaging

---
 debian/control                      |  6 ++----
 debian/dh-ocaml.conf.json           |  4 ++++
 debian/libeqaf-ocaml-dev.docs       |  1 -
 debian/libeqaf-ocaml-dev.install.in | 14 --------------
 debian/libeqaf-ocaml.install.in     |  5 -----
 5 files changed, 6 insertions(+), 24 deletions(-)
 create mode 100644 debian/dh-ocaml.conf.json
 delete mode 100644 debian/libeqaf-ocaml-dev.docs
 delete mode 100644 debian/libeqaf-ocaml-dev.install.in
 delete mode 100644 debian/libeqaf-ocaml.install.in

diff --git a/debian/control b/debian/control
index b233a79..7d9f841 100644
--- a/debian/control
+++ b/debian/control
@@ -1,6 +1,5 @@
 Source: ocaml-eqaf
 Section: ocaml
-Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint@lists.debian.org>
 Uploaders: Stéphane Glondu <glondu@debian.org>
 Build-Depends:
@@ -10,9 +9,8 @@ Build-Depends:
  libcstruct-ocaml-dev,
  libalcotest-ocaml-dev <!nocheck>,
  libcrowbar-ocaml-dev <!nocheck>,
- dh-ocaml (>= 1.2)
-Standards-Version: 4.7.0
-Rules-Requires-Root: no
+ dh-ocaml (>= 3.4~)
+Standards-Version: 4.7.4
 Vcs-Browser: https://salsa.debian.org/ocaml-team/ocaml-eqaf
 Vcs-Git: https://salsa.debian.org/ocaml-team/ocaml-eqaf.git
 Homepage: https://github.com/mirage/eqaf
diff --git a/debian/dh-ocaml.conf.json b/debian/dh-ocaml.conf.json
new file mode 100644
index 0000000..08dd956
--- /dev/null
+++ b/debian/dh-ocaml.conf.json
@@ -0,0 +1,4 @@
+{
+  "dune_layout_version": 1,
+  "dh_ocamllibinstall": true
+}
diff --git a/debian/libeqaf-ocaml-dev.docs b/debian/libeqaf-ocaml-dev.docs
deleted file mode 100644
index a7a328f..0000000
--- a/debian/libeqaf-ocaml-dev.docs
+++ /dev/null
@@ -1 +0,0 @@
-usr/doc/*/*
diff --git a/debian/libeqaf-ocaml-dev.install.in b/debian/libeqaf-ocaml-dev.install.in
deleted file mode 100644
index e06b4e3..0000000
--- a/debian/libeqaf-ocaml-dev.install.in
+++ /dev/null
@@ -1,14 +0,0 @@
-@OCamlStdlibDir@/*/*opam*
-@OCamlStdlibDir@/*/*dune*
-@OCamlStdlibDir@/*/*.ml*
-@OCamlStdlibDir@/*/*.cmi
-@OCamlStdlibDir@/*/*.cmt*
-OPT: @OCamlStdlibDir@/*/*.a
-OPT: @OCamlStdlibDir@/*/*.cmx
-OPT: @OCamlStdlibDir@/*/*.cmxa
-@OCamlStdlibDir@/*/*/*.ml*
-@OCamlStdlibDir@/*/*/*.cmi
-@OCamlStdlibDir@/*/*/*.cmt*
-OPT: @OCamlStdlibDir@/*/*/*.a
-OPT: @OCamlStdlibDir@/*/*/*.cmx
-OPT: @OCamlStdlibDir@/*/*/*.cmxa
diff --git a/debian/libeqaf-ocaml.install.in b/debian/libeqaf-ocaml.install.in
deleted file mode 100644
index 0f2ecc4..0000000
--- a/debian/libeqaf-ocaml.install.in
+++ /dev/null
@@ -1,5 +0,0 @@
-@OCamlStdlibDir@/*/META
-@OCamlStdlibDir@/*/*.cma
-DYN: @OCamlStdlibDir@/*/*.cmxs
-@OCamlStdlibDir@/*/*/*.cma
-DYN: @OCamlStdlibDir@/*/*/*.cmxs
-- 
2.30.2